Remove window background getters again

They were added as accessors for 2.22 even though querying the
background wasn't possible previously. As GTK 3.0 will change background
handling, it doesn't make sense at all to expose these getters.

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 598d434c3944c9ac4aa8710c7656ea0348392c5d..8a582433e8ccc01f79f4b52fc257a4acae7cfacf 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -579,8 +579,6 @@ gdk_window_move_resize
 gdk_window_scroll
 gdk_window_move_region
 gdk_window_get_accept_focus
-gdk_window_get_back_pixmap
-gdk_window_get_background
 gdk_window_get_composited
 gdk_window_get_cursor
 gdk_window_get_focus_on_map

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 43242944cc18723d8c50e58abd5ee3da53a96eb6..d5bc413dfa470d2737d9255b962cacefb771ab26 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -7053,29 +7053,6 @@ gdk_window_move_region (GdkWindow       *window,
   cairo_region_destroy (nocopy_area);
 }
 
-/**
- * gdk_window_get_background:
- * @window: a #GdkWindow.
- * @color: (out): a #GdkColor to be filled in
- *
- * Sets @color to equal the current background color of @window.
- *
- * Since: 2.22
- */
-void
-gdk_window_get_background (GdkWindow *window,
-                           GdkColor  *color)
-{
-  GdkWindowObject *private;
-
-  g_return_if_fail (GDK_IS_WINDOW (window));
-  g_return_if_fail (color != NULL);
-
-  private = (GdkWindowObject *) window;
-
-  *color = private->bg_color;
-}
-
 /**
  * gdk_window_set_background:
  * @window: a #GdkWindow
@@ -7117,43 +7094,6 @@ gdk_window_set_background (GdkWindow      *window,
     }
 }
 
-/**
- * gdk_window_get_back_pixmap:
- * @window: a #GdkWindow.
- * @pixmap: (out) (allow-none): a #GdkPixmap to be filled in, or %NULL.
- * @parent_relative: (out) (allow-none): a pointer to a #gboolean to be filled in, or %NULL.
- *
- * Sets @pixmap to the current background pixmap of @window.  You do not
- * own the pointer that is returned and this pointer should not be freeed
- * or unreferenced.  Sets @parent_relative to %TRUE if the tiling is done
- * based on the origin of the parent window.
- *
- * Since: 2.22
- */
-void
-gdk_window_get_back_pixmap (GdkWindow  *window,
-                            GdkPixmap **pixmap,
-                            gboolean   *parent_relative)
-{
-  GdkWindowObject *private;
-
-  g_return_if_fail (GDK_IS_WINDOW (window));
-
-  private = (GdkWindowObject *) window;
-
-  if (pixmap)
-    {
-      if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG ||
-          private->bg_pixmap == GDK_NO_BG)
-        *pixmap = NULL;
-      else
-        *pixmap = private->bg_pixmap;
-    }
-
-  if (parent_relative)
-    *parent_relative = (private->bg_pixmap == GDK_PARENT_RELATIVE_BG);
-}
-
 /**
  * gdk_window_set_back_pixmap:
  * @window: a #GdkWindow

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 516df97b6461cbf99d850f3cd7f405ac622b190d..77523c442b97f0cf35bd3409b2392250fff24440 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -688,13 +688,8 @@ void          gdk_window_set_startup_id    (GdkWindow     *window,
                                            const gchar   *startup_id);
 void          gdk_window_set_transient_for (GdkWindow     *window,
                                            GdkWindow     *parent);
-void          gdk_window_get_background  (GdkWindow       *window,
-                                          GdkColor        *color);
 void         gdk_window_set_background  (GdkWindow       *window,
                                          const GdkColor  *color);
-void         gdk_window_get_back_pixmap (GdkWindow       *window,
-                                         GdkPixmap      **pixmap,
-                                         gboolean        *parent_relative);
 void         gdk_window_set_back_pixmap (GdkWindow       *window,
                                          GdkPixmap       *pixmap,
                                          gboolean         parent_relative);